add software watchdog changes from trunk

SVN-Revision: 2858

diff --git a/openwrt/package/busybox/config/miscutils/Config.in b/openwrt/package/busybox/config/miscutils/Config.in
index 072993b28d4de33ccafcb8bef60713a4ad543644..77dc85cd05142e5580d0c10319c44e3cc611e8b9 100644 (file)
--- a/openwrt/package/busybox/config/miscutils/Config.in
+++ b/openwrt/package/busybox/config/miscutils/Config.in
@@ -188,7 +188,7 @@ config BUSYBOX_CONFIG_TIME
 
 config BUSYBOX_CONFIG_WATCHDOG
        bool "watchdog"
-       default n
+       default y
        help
          The watchdog utility is used with hardware or software watchdog
          device drivers.  It opens the specified watchdog device special file

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index d7d49e530c46e5a436059d67cbfe2d1206f8057c..e337ad02beb53e0d727f80c1fcc7a23faaa5e43d 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -355,4 +355,11 @@ config BR2_PACKAGE_KMOD_PWC
        tristate "Kernel driver for USB Philips Cameras"
        default m
 
+config BR2_PACKAGE_KMOD_SOFTDOG
+       tristate "Kernel driver for software watchdog"
+       default m
+       help
+         Kernel modules for software watchdog driver
+
+
 source "target/linux/package/Config.in"

diff --git a/openwrt/target/linux/control/kmod-softdog.control b/openwrt/target/linux/control/kmod-softdog.control
new file mode 100644 (file)
index 0000000..88a7400
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-softdog.control
@@ -0,0 +1,6 @@
+Package: kmod-softdog
+Priority: optional
+Section: sys
+Maintainer: OpenWrt Developers Team <[email protected]>
+Source: buildroot internal
+Description: Kernel software watchdog driver

diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 133689659e077a174be42aa9e191e3bcbd79621c..ff426fdaffb795ebb35dc39e80dabbc3d2eb7c62 100644 (file)
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -197,6 +197,10 @@ $(eval $(call KMOD_template,PWC,pwc,\
        $(MODULES_DIR)/kernel/drivers/usb/pwc.o \
 ))
 
+$(eval $(call KMOD_template,SOFTDOG,softdog,\
+       $(MODULES_DIR)/kernel/drivers/char/softdog.o \
+))
+
 $(TARGETS): $(PACKAGE_DIR)
 
 $(PACKAGE_DIR):

diff --git a/openwrt/target/linux/linux-2.4/config/brcm b/openwrt/target/linux/linux-2.4/config/brcm
index 75c7f733e72e1e24b5f9c365624b646b501953ed..292f30fc7283d91c354c560599aa4ef4318f0a97 100644 (file)
--- a/openwrt/target/linux/linux-2.4/config/brcm
+++ b/openwrt/target/linux/linux-2.4/config/brcm
@@ -947,7 +947,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_60XX_WDT is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SCx200_WDT is not set
-CONFIG_SOFT_WATCHDOG=y
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_W83877F_WDT is not set
 # CONFIG_WDT is not set
 # CONFIG_WDTPCI is not set